bitkeeper revision 1.1128 (410f8501U6k1p4VW0CM4HcZS8VUAwQ)
authorcl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Tue, 3 Aug 2004 12:28:49 +0000 (12:28 +0000)
committercl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Tue, 3 Aug 2004 12:28:49 +0000 (12:28 +0000)
commit7a979ff71d6829903d248bc225f5225a70b1a74b
treecfc253ef92a3e4ab3bd90638d0b01d0a3fe1283f
parent729eafec17f760c867d2fa2c8b2e00ea0529d4e4
parent034b4791aa83d8e9d6adbdfc249c537deee651e9
bitkeeper revision 1.1128 (410f8501U6k1p4VW0CM4HcZS8VUAwQ)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xeno.bk-ptrw
xen/arch/x86/memory.c
xen/arch/x86/traps.c
xen/common/schedule.c
xen/include/asm-x86/mm.h
xen/include/xen/sched.h